Squash strict aliasing warning in _NET_VIRTUAL_ROOTS code.

Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>

        * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
        strict aliasing warning in _NET_VIRTUAL_ROOTS code.

diff --git a/ChangeLog b/ChangeLog
index 5a68de5e848a249334e0e8a0486c5eb84554c032..b0eef4bb1c206730fe560698c887bf31dca717eb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
+       strict aliasing warning in _NET_VIRTUAL_ROOTS code.
+
 2005-01-19  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkkeys-win32.c (update_keymap,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5a68de5e848a249334e0e8a0486c5eb84554c032..b0eef4bb1c206730fe560698c887bf31dca717eb 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
+       strict aliasing warning in _NET_VIRTUAL_ROOTS code.
+
 2005-01-19  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkkeys-win32.c (update_keymap,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5a68de5e848a249334e0e8a0486c5eb84554c032..b0eef4bb1c206730fe560698c887bf31dca717eb 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Wed Jan 19 17:17:31 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkwindow-x11.c (gdk_window_get_frame_extents): Squash
+       strict aliasing warning in _NET_VIRTUAL_ROOTS code.
+
 2005-01-19  Tor Lillqvist  <tml@novell.com>
 
        * gdk/win32/gdkkeys-win32.c (update_keymap,

diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
index da250e5c174099e6b342c6e5c5bdf6eecd0034a8..040b32baaac05a32d5b3dbe380fa790e5664ede0 100644 (file)
--- a/gdk/x11/gdkwindow-x11.c
+++ b/gdk/x11/gdkwindow-x11.c
@@ -3134,6 +3134,7 @@ gdk_window_get_frame_extents (GdkWindow    *window,
   Window xparent;
   Window root;
   Window *children;
+  guchar *data;
   Window *vroots;
   Atom type_return;
   unsigned int nchildren;
@@ -3182,11 +3183,14 @@ gdk_window_get_frame_extents (GdkWindow    *window,
                                                                 "_NET_VIRTUAL_ROOTS"),
                          0, 0x7fffffff, False, XA_WINDOW, &type_return,
                          &format_return, &nitems_return, &bytes_after_return,
-                         (unsigned char **)(&vroots))
+                         &data)
       == Success)
     {
-      if ((type_return == XA_WINDOW) && (format_return == 32) && (vroots))
-       nvroots = nitems_return;
+      if ((type_return == XA_WINDOW) && (format_return == 32) && (data))
+       {
+         nvroots = nitems_return;
+         vroots = (Window *)data;
+       }
     }
 
   xparent = GDK_WINDOW_XID (window);